version:

1.1.0
1.1.1
<<<<<<< .mine
1.1.2

new...=======
1.1.2

xxxxxxxxxxxxxxxxxxxx

ghfjgjh,jghfnh,jh.khgjy>>>>>>> .r5
